merge
authorIan Campbell <ian.campbell@xensource.com>
Wed, 13 Dec 2006 11:32:04 +0000 (11:32 +0000)
committerIan Campbell <ian.campbell@xensource.com>
Wed, 13 Dec 2006 11:32:04 +0000 (11:32 +0000)

Trivial merge